From: Saverio Proto <zioproto@gmail.com>
Date: Sat, 11 May 2013 12:47:22 +0000 (+0200)
Subject: Merge remote-tracking branch 'nodogsplash/master'
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22/%22https:/collectd.org/%22?a=commitdiff_plain;h=38be3fb0732dcd69682d96fcee3d73199f65507c;p=feed%2Frouting.git

Merge remote-tracking branch 'nodogsplash/master'
---

38be3fb0732dcd69682d96fcee3d73199f65507c